Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump llvm to tip of main #7440

Merged
merged 15 commits into from
Aug 9, 2024
Merged

Conversation

mwachs5
Copy link
Contributor

@mwachs5 mwachs5 commented Aug 5, 2024

No description provided.

@youngar
Copy link
Member

youngar commented Aug 5, 2024

try adding #include "llvm/ADT/MapVector.h" to the top of lib/Conversion/SeqToSV/FirMemLowering.cpp

@mwachs5
Copy link
Contributor Author

mwachs5 commented Aug 8, 2024

Looks like there are some passes doing some things that are not compatible with upstream LLVM changes. Can you take a look please:

MooreToCore - @fabianschuiki @maerhart
VerifToSMT - @maerhart
FlattenIO - @mortbopet

@mortbopet for the latter I reduced it to this failing case:

// RUN: circt-opt --hw-flatten-io %s | FileCheck %s -check-prefix BASIC
// RUN: circt-opt --hw-flatten-io="flatten-extern=true join-char=_" %s | FileCheck %s -check-prefix EXTERN

// Ensure that non-struct-using modules pass cleanly through the pass.!Struct2 = !hw.struct<aa: !Struct1, bb: !Struct1>
!Struct1 = !hw.struct<a: i1, b: i2>
!Struct2 = !hw.struct<aa: !Struct1, bb: !Struct1>

hw.type_scope @foo {
  hw.typedecl @bar : !Struct1
}
!ScopedStruct = !hw.typealias<@foo::@bar,!Struct1>

// BASIC-LABEL: hw.module @scoped(in %arg0 : i32, in %in.a : i1, in %in.b : i2, in %arg1 : i32, out out0 : i32, out out.a : i1, out out.b : i2, out out1 : i32) {
// BASIC-NEXT:    %0 = hw.struct_create (%in.a, %in.b) : !hw.struct<a: i1, b: i2>
// BASIC-NEXT:    %a, %b = hw.struct_explode %0 : !hw.struct<a: i1, b: i2>
// BASIC-NEXT:    hw.output %arg0, %a, %b, %arg1 : i32, i1, i2, i32
// BASIC-NEXT:  }
hw.module @scoped(in %arg0 : i32, in %in : !ScopedStruct, in %arg1: i32, out out0 : i32, out out: !ScopedStruct, out out1: i32) {
 hw.output %arg0, %in, %arg1 : i32, !ScopedStruct, i32
}

@@ -187,7 +186,7 @@ class FlattenIOTypeConverter : public TypeConverter {
ValueRange inputs, Location loc) {
auto structType = getStructType(type);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This would be unused in a non-assert build.

@maerhart
Copy link
Member

maerhart commented Aug 9, 2024

Thanks for fixing this @fabianschuiki ! LGTM!

@mwachs5
Copy link
Contributor Author

mwachs5 commented Aug 9, 2024

@fabianschuiki can you help with the merge conflict? Should i just take what is on main?

@fabianschuiki
Copy link
Contributor

@mwachs5 Looks like that did the trick! 😄

Copy link
Contributor

@fabianschuiki fabianschuiki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for going through all this pain @mwachs5 🥳 🙌 !

Co-authored-by: Fabian Schuiki <fabian@schuiki.ch>
@dtzSiFive
Copy link
Contributor

Thank you, @mwachs5 !!! Sorry this was a rougher one!

@dtzSiFive dtzSiFive merged commit 9f1d9f9 into llvm:main Aug 9, 2024
4 checks passed
@mwachs5 mwachs5 deleted the dev/mwachs5/llvm-bump-aug-2024 branch August 9, 2024 22:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants